From: Juri Linkov <juri@jurta.org>
Date: Fri, 28 Aug 2009 23:49:11 +0000 (+0000)
Subject: (image-type-header-regexps): Use only JPEG magic number
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10811
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=46249b1f70efd0c0c13c887ddb0e4afc39da1d60;p=emacs.git

(image-type-header-regexps): Use only JPEG magic number
to determine JPEG images, and don't use `image-jpeg-p' because
Emacs can display non-JFIF non-Exif JPEG images.
---

diff --git a/lisp/image.el b/lisp/image.el
index 076a969a363..92e7560a9ca 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -43,7 +43,7 @@
 static \\(unsigned \\)?char \\1_bits" . xbm)
     ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff)
     ("\\`[\t\n\r ]*%!PS" . postscript)
-    ("\\`\xff\xd8" . (image-jpeg-p . jpeg))
+    ("\\`\xff\xd8" . jpeg)    ; used to be (image-jpeg-p . jpeg)
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
 	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
 	(concat "\\(?:<\\?xml[ \t\r\n]+[^>]*>\\)?[ \t\r\n]*<"